[mr2808] fix two problems, inserted in 2806 - one crush and "two-map" state, thx to Undergarun.