Fixed Commandr runtime error