fix for issue 13