Code fix

Changes requested by ntalbott