FIX: fixin' up the handler