fixed Issue #228 & http://forums.pocketgno.me/viewtopic.php?f=121&t=8198&p=76424#p76424