Fixed crash in #2 too