Fixed a bug, thx lars
Merge remote-tracking branch 'cjd/crashey'