Fixed Intrument Bugs