fixed STD non-handle bugs