Fixed issue caused by migrating laptops