Loki fix