temporarily disable fail on modify, will revisit...