Bugfix #135