Fixes aalborg layouts, Issue #5742