#26,#30 Bugfix