Fixing messages not being instant