Fixing #16 in Non-ExtLib branch