fix problems!