commit #656