Fixes #349