Fixed the problem that some times the display get messed up.
Authored by: josepva 2016-05-30
Parent: [r8]
Child: [r10]
