Apply original commit with minor alterations

Original commit from Peppie23;
https://github.com/Peppie23/RemoteTech/commit/e073bfa58f8da4e138356d6f83751aca91e11273
Merge branch 'Peppie23-jaidans-modulenginefx-fix' into develop