Finally resolves #1