More proper fix to regex