Ticket/naderman/11700

More fixing