Add hacky solution for todo12