Merge branch 'bug#226' into 'master'

Fix for bug#226

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