regex fixes ? hacks