Further attempts to fix