Correcting issue #71