Correcting issue #48