LAMBDA-28: fix layout