1st ver bugfixed