Small fix for option remove. New version of patch attached.