Fixed problems 4