Issue 258

This should fix Issue #258.