#168 should work now.
But please test it