Fixed forward declaration