Bugfix - earlier implementations in cvs ported back