Another bug fix
Merge branch 'fix/fix-another-bug' into release