Fixed #610