Fixed for relationship with other gems