Fix workaround for 170