Work #9.3

Remove "play yourself" bug