Modified at work. Resolves #1.