Fixed problems!