Fix another Type Error related to Issue #1