*fixing Issue #71 and partly #67