fixed issue #15 in cct.ok.ubc.ca