Fix for eApp obsolete case