Better fallback mechanism for old states
merge