Slightly changed to match the latest javabio