Maybe fixed wierd bug?