Issues/317 naive skip