Fix buggish behaviour