Fixed the virtual bugs