A quick fix for a TODO