The commands needs to be handled separately from the rest of the result types. Added a test case that reproduces the problem and verifies that the change in code fixes it.
