Fix sound issue - logic fail