Merge branch 'bug#94' into 'master'

Fix for Bug#94

See merge request !10
1 job for master
in 0 seconds, using 0 compute credits, and was queued for 6 seconds