update final patch from 812265
Merge pull request #4 from darkxst/master

bug 812265