Fixed: VSI crash