Fix for on/check handlers