Additional Fix for Issue# 169

Fixes #169