memory: adjust safeguard to changes from previous commit