Bugfix #135 and #136