Merged sound bug fix from ac-stef/AC