corrected issue #11