applied patch received from @endeveit - https://gist.github.com/endeveit/8368438