Fixed sizeof issue, see Construc2 99fc35d commit