Issue 356

This should solve issue #356.