Fixing implementation