Fixed #1014