Probably fixed a todo