Finally got a working solution for 616