fixed regex parsing