Correcting issue #78