The commit on "switched" seems to be working correctly now.