Issue 341

This should solve Isue #341.