Added workaround for evil issue #364.