Additional Fix for Issue# 169