Fixed interaction bugs