fixed regexp shit