cleanup
fix a bug