fixed for issue #2