Make the implementation follow the documentation!