fixing some bugs on interaction