Hopefully a complete fix for Shrines...