Fix for future parser