Fix our code. Now behaves more normally