commit #657