Hopefuly fixed bug