Fixed PI part of issue #2