JNDI correction