fixed bugs with new variants