mimic method from 1.0.1 branch / no wait