Fix: layout option is not passed