Working with issue #82. Not sure if this fixes the problem in the long run but hey it makes it work for us now!