Fix for issue #146 See merge request !483
mentioned in commit eece2791
mentioned in merge request !484 (merged)
mentioned in commit 3ed938f4