First commit of the fixed plugin