Fix previous commit (untested)