Continue 1.8 port