Fix for Bug# 1190330