fix size problem and seems works right now