Builder order check, fixes #471