SOLID fix