Merge branch '529-minor-optimisation-of-pisces-routines' into 'branch_5.0'

small bugfix in "Minor optimisation of PISCES routines"

Closes #529 (closed)

See merge request !691 (merged)

(cherry picked from commit 789f105d)

e911cc0f bugfix