Fixed issue #491 "Some Blocks Return to Default on Load"