fixing some bits