Fixed #1060 #1061 #1062 (#1079)

3 files changed