Fixed drawing type in Pair