Fix occasional crash
Release 1.1