shift bug resolved