Fix block crashes in eclipse