Fixed data-type issue