Made a change to get the buggy behavior again