Better solution for #64 (no settimeout)