Fix for cmd check