Fix backward compatibility
Merge pull request #218 from nmusienko/JFG-386

Fix backward compatibility