fixed issue with inner class remapping