Bug Fixes: Back behavior fix