fix and re-enable