Merge branch 'bug_fix' into 'master'

Bug fix

See merge request !6
2 jobs for master in 1 minute and 48 seconds (queued for 1 second)