More overflow protection