Fixed #1054