Fixed crash. Cleanup.