Fixing #19