Correcting issue #26