Henrik Reitan
(apparently) fixed crash