resolves #564