Removed crash-causing code