Seems to have fixed bug