Removed class conditional so it works on Subclsses