Fixed giant type issue