Fixing derpy query