Fixing the volume as well