Added Fix for issue #17