Last fix for broken logic