Fix for Bugs: 3022,3034,3021,3023