corrected regex, added additional check I failed to add back in