fixing problems!