Issue 263

This should fix Issue #263.