Fixed issues in r/1918