fix for issue 24