FIXED: duplicate symbol issue