improve fluidity

- fix to improve fluidity