Issue 427

Resolves issue #427