#52 Fix TypeError