1133 bug fix

@axelstudios Can we add some asserts in here to make sure this works