Fix previous commit to work properly