final change for #1155 #1181

Closed belforte closed 10 years ago