Additional Fix as part of #90