Added workaround for current sound issues