Ticket 4059

New pull request for fix to Ticked 4095