Added java fallback. It still needs some fixes..