Adding a temporary fix in reference to issue #326
Merging temporary fix for #326 into master branch