Let's try fixing this bug