Fix annotations leaking across multiple classes