Fixed VS crash