Bugfix solved #19