Fixed: Issue 456 - segmentation fault