- fix for a possible crash