fixes 4 (to be continued)