Another issue fixed