Further fix for issue 106