Fixed #1096