Fix for issue #19 (first point)