Bug fix: load_state macro invoked save_state method and vice versa!