Added code to reliably determine volume name