-- fixed sizeMapping