#464 - corrections