Should we create another issue for this?