fixed critical bug + improvement