Merge branch 'bug#218' into 'master'

Fix for bug#218

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