Temporary fixes #17