Fixing todo