Unbreak panda on jvm also