Fix for in memory systems