Fixed ISSUE #19 (Make compiler happy)