fixed some issues with variants