Issue #17: Removed the todo