more bullet-proofing; should nail the FATAL bug we hope