fixes tracker issue #297