Fix for fatal in #13

#13