Chambliss, fixes #523