fix for race condition on controller loading