Feature/fix maintenance mode