Fixed for Issue #495,#498