Fix forward reference