Fix Added for issue #189