fixed shit code