Hopefully fix memory violation?