regexp fixing. fix #3