Fixed #1086