bugfix #161