added fixes for the other variants as well