FIX: more frequent memory checks