fixes #955 #956 #957

Closed belforte closed 10 years ago