updating to include adam's fix