Fix regex so it doesn't capture just part of the answer