Fixed cases 5 and 6