Quick fix, because regexes are like black magic. Additional fix for #505.