Disabling forced bug put in in previous commit