Fixed two bad cases