Modify for ponyo kernel