FC-2877 start up bug fix