Respond to review comments and fix an edge case