Fixed a bug and added more VEP compatibility