Issue 262

This should fix Issue #252.