fixed issues with thing