Bugfixes (#48 #49)