Starting on fixing nosound, discovered new bug