#45 Fix TypeError