Correct issues with previous update for Ticket #117