custom data fixes