Merge branch 'bug#212' into 'master'

Fix for bug#212

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