Make changes from trak ticket #2534
Make changes from trak ticket #2534