my brain almost blow up ))
more fix