Compatibility fix #2