Fixing ourgrid-commons