Merge branch 'bug#170' into 'master'

Fix for Bug#170

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