refs #357 - bugs resolved