PR for issue #894

As indicated in #894, these are the files fixes/modifications.