Fixes impl as per Chris review