Fixing lazy issue