This shouldn't have been necessary

Forgot to fix an issue in last version. This is the final version,
FINALLY