fixed ver 16