Revert to magic value code, should fix all known issues...