fixing some mess