Fixed interaction bug
Merge branch 'dev' into event-stops