Add solution for fix34