Fix for issue#164

Fix for issue#164