3.8.4 - closes #479