issue838 and projectlist
issue838 completed and tested locally
issue838 fixed and tested locally