Fixes 5a