Posible Fix to issue #94