refs #530, #502