fixes from reddit