Fix/assertions

n/t