fix #1186 should also take care of #1185 #1187

Closed belforte closed 9 years ago