attempted to switch off isFinal
Revert "attempted to switch off isFinal"

This reverts commit 71b14a8bca101527619b21f5e7ff262f72581cf3.