Issue 269

This should solve Issue #269.