fixes #1122 #1118 #1102 #1123

Closed belforte closed 10 years ago