Fixing what looks like an issue introduced during a merge - causes critical errors during rendering