Need to check if it's set here too