FIX, don't use regex