Fix for issue 175

This commit fix the issue 175.