Fixed #21, and as side-effect, Grease will now also work