Fixes #55