fixed fixtures stuff again