update according to Igor's comment on not always working CATALINA_HOME