FIX: crash introduced during other fixes ?
FIX: overly aggressive memory use reduction