Avoid unsafe optimization
(Probably) more efficient