Fixed 16 16 (18/27)

Fixed 16 16