Slight change to support Nikola 6.x