Fix for tag schema