Fix fail on start