fix for issue 123