Provisional fix for #250, yet to be revised for 0.3.0