The builtin logic was flawed