Added a hack for NCDB