ADEN-188 Type casting fix