Looks like I only fixed it for the maximizer UI, will have to see what is different for command line.