bugfix #29