Bugfix for #31 implemented