Fixes Collections and Views #59

Fixes #59