bugs on refs #528