Really fix this bug this time