FIxing JNDI