FIXED Issue #17