fixed kona64
merge