Bugs with 640 and 960 fixed