Fixed on Launch bug

Fixed on Launch bug