Bugfix #16