reenable non-breaking code