modify for compatibility