Fix for GIJ app