Fixed real quick for the new UI