Portfolio Manager Bug Fix