Riddle - Update answer and fixed some regex parse issue since inconsistent match pattern