last fixes for 292 #941

Closed belforte closed 10 years ago