Yet again had to fix page shift