correct impl from stef