applied fix for issue #6