Fixing extern issue