Reverted to old ugly regex for size