make it work
fix a bug