One more attempt to avoid fpic warning
Change type handling