Fixed #618, Fixed 621