Issue #231
changes __block to __weak