Fix the long-standing bug properly