Fix another 16-bit problem
Fix another 16-bit problem

asgeroverby/cpputest,offa/cpputest,maxilai/cpputest,devMichaelJones/cpputest,arstrube/cpputest,jaeguly/cpputest,KisImre/cpputest,arstrube/cpputest,chenlianbing/cpputest,chenlianbing/cpputest,KisImre/cpputest,asgeroverby/cpputest,chenlianbing/cpputest,cpputest/cpputest,devMichaelJones/cpputest,devMichaelJones/cpputest,PaulBussmann/cpputest,KisImre/cpputest,basvodde/cpputest,Andne/cpputest,PaulBussmann/cpputest,basvodde/cpputest,Andne/cpputest,cpputest/cpputest,bithium/cpputest,devMichaelJones/cpputest,offa/cpputest,jaeguly/cpputest,cpputest/cpputest,basvodde/cpputest,cpputest/cpputest,arstrube/cpputest,bithium/cpputest,offa/cpputest,arstrube/cpputest,asgeroverby/cpputest,Mindtribe/cpputest,basvodde/cpputest,maxilai/cpputest,jaeguly/cpputest,Mindtribe/cpputest,maxilai/cpputest,chenlianbing/cpputest,jaeguly/cpputest,Mindtribe/cpputest,PaulBussmann/cpputest,Mindtribe/cpputest,Andne/cpputest,asgeroverby/cpputest,maxilai/cpputest,KisImre/cpputest,offa/cpputest,Andne/cpputest,bithium/cpputest,PaulBussmann/cpputest,bithium/cpputest