commit #653