fixing todo