Fix oversight from last patch by CaptainFake (module, index, ...)