1.7 - Fixed custom wrapper class bug