Fixing implementation 2