Fix Merged Bug

修复上次merge的bug