improve volume handling