Feature/fix vcr

This commit fixes #32