Fix for the previous commit