Subclass Responsibility fix