Fixing forward reference