bugfix #244