Fix for the bug introduced by --intrumentation fix