Fixing the #465 bug.. hopefully this works now.