Double reporting fix