Good point, will move this code to init method in the next patch.