Fixed #1511