Fixed rare crash-bug