fix issue 60

https://gist.github.com/anonymous/c24c3783060ad30e7b0d