One more issue fixed