fixed similar things