Fixed interaction issues