Fix for line numbers