fixed for issue #6