Starting to fix issue #180