Change version 6 regexp