Workaround to use the same class in both situations...