Fix Bug #864
Fix Bug #864