resolves #355 for realsies