Implementation fixed