Bugfix #12 #18