Fix ambigous case and added temporary fix - commands should now owork.