Merge branch 'bug#89' into 'master'

Fix for bug#89

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