Fixed #1594