Fixed issue# 84 and 85.