Fixed Serialization

Don't mind that last commit, I was just kidding... /facepalm