[2.1.x] Fix for #61

Pull request to fix issue #61