FIX: Dont quit early