[code review] resolves #425