Merge branch 'bug#169' into 'master'

Proposed fix for Bug#169

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