Quick fix for Altars, even more performance improvement.