5575 (fixes Lee's commit), 5677