Resolves #16, not 14