Fixed #176 with new rendering