removed crash caused by an old workaround