custom fixes for artemis