made regex even more robust :)