Revert change with default location
Fix java based rendering