Added special case for volume change