addressed issues 547 and 647