Some updates to correct the reverseEabled feature