Bugfix for #19