Fixes #44