#299 bugfix