File and Line numbers are now properly set