fixed #355 and #356 (portfolio issues)
Merge pull request #357 from pencilblue/PB356

fixed #355 and #356 (portfolio issues)