Fixed issue with inner class