fix issues with not returning early.