Issue 208

This should solve Issue #208.