Removed hack introduced by VG