Merge branch 'bug#224' into 'master'

Fix for bug#224

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