#991: #947: additional overwrites found and fixed
opened by thuchacz