Compatibility with 3.4 (see #6)