fixed issues #495, #500