Fixed #1135