fixing handling for non-bundle based apps