Refs #7 fixed bug