Fixes the compatibility issue #23