fix for issue #9
bug fixing