Fixed #1024