Bug final fix July