Fixed multiple definition issue