Fix to handle string class names too