Fix instrument logic