Fixing assertions