Fix: safer behaviour handling java variables