Fixing for #109