Fixed issue# 766