Fix for crash report 1272