Resolves #67

This is a better way to do that.