Fix for Tinkerer's's