performance, fixed #240