In the middle of fixing diagonal bug