Making changes based upon issue #406