#101 remove blocking return