Attempting to stop the race condition

Reworking slightly the compass creation integration.