Fix for issue #4

Tested on two 2.11 PIAF servers. Needs testing on 2.10