Corrected issue #18