Fix for my previous commit