fixed some user interaction