Eugene Simakin Fix for issue#17