bug-1161: bugfix