fixed for issue #1