Refers EP-283 -- fixup