Bug fix
clean up