Fixes #526 correcting PR for 2nd problem