Fix issue with props getting polluted

Fixes #69