Removed TODO regarding #11