some fixes

- fix #419
- fix #420