Great catch here. I actually forgot to make these scl aware on my branch.  Keep this change.