Hotfix from ASTRO_POINTER