Bugfix #14