Issue 261

This should fix Issue #261.