I did this instead: https://github.com/JaviSoto/Commando/commit/d95e8b1219ff527c48cdff9393a20ff0ac396ea4