bugfix #159