Added new attribute to disable to fix #2