bug fixing + 10s debug