fixed #355 and #356 (portfolio issues)