Fixed tricky backwards compat. logic.
Signed-off-by: Chris Sanders <zidane@outlook.com>