Added quick hack that fixes #12