bugg fixed