* Changes for a correct display behavior