Maybe fixed a bug