Fixing non move topics