BOOK-464 fix variable order