Corrected issue #28