Gaylord bugfix