#1383 and fixing topics