Removing assert for now, needs more work...