hot fix pop function
complete Issue1