Fix for #26 I think