Static inputs issue fixed