commit #598