1.4 Fork fix

1.4 Fork fix
Merge pull request #270 from xnljfr/1.4.1

1.4 Fork fix