correction: for issue #7