Handle knockout separately (Closes #1151)