Fix for my previous patch