Fixed issues for r/1969