Added simple (Not final!!) fix to function references in structures