Add support for Flutie fixes #20