fixed issue with new UI change