fixed regex expressions