Small Correction to allow for longer class names without throwing an error