Fixing swap to mobile breaking includes from node