Fixed #1123