Used instance of where possible issue #22