Slightly changed again to match the latest javabio