fix for issue 15