This should resolve #144