Bugfix #7 & #8