closes #440