Quick EOL hotfix causing weird issues on x64 systems.

Signed-off-by: Brad Davies <brad93@gmx.com>
Merge branch 'develop'
Merge branch 'develop'