Almost fixed or already fixed :D