[secondary] Fixes bugs due to a comment.