New Fix for #410

This should hopefully fix the issue.