Fix for older versions