Fix #1690 Updated