Fix for object launch mode