Fix for my last fix