better edgecase
fixed not recoverable state after out of memory