Mark #4 as fixed