Found this thread, and the solution to the issue. M502 and M500
It seems like this issue has been around for a while.