these commands are not critical for the current release, the fix will take
some time, the codebase is good. let's make it work later