Fixing typing