Bug# 806 fix