corrected issue #4