Correcting issue #11