Better fix for issue #218
Better fix for issue #218

shinji-s/pika,zixiliuyue/pika,knowsis/pika,benjamin9999/pika,Tarsbot/pika,skftn/pika,vitaly-krugl/pika,renshawbay/pika-python3,pika/pika,fkarb/pika-python3,jstnlef/pika,reddec/pika,hugoxia/pika,vrtsystems/pika,Zephor5/pika