Fix for object-tools :(