fix for issue 169