Fix for breakage of Thumbs plugin due to recent changes