further fix on self assessment