Lone fix

Pulling a single commit now because I won't have time for codering until summer
Admin, please look at the changelog commit and tell if it's okay to do it.