Merge branch 'fix-231' into 'master'

Fix #231

Closes #231

See merge request !588
2 jobs for master in 39 seconds (queued for 1 second)