re-enabled support of layout changes