Fixed issue with double prefixed shadow tables