Compatibility issue solved for #6