Avoid the zero bug