Another fixes for #185, should be fine