Bug Fix - Invoice Model