Removing Artemis limitation