Bugfix - Fixed TypeError