Removed a seg-fault.