f115 - fix for crash