[PATCH 04/12] Changed pet ticket #135.