fixed perfomance
+ bug