fixes + 5.1 d)