Re-tested fix for #440
Test model for #444