Fix multiple apps