Added bas080's compatibility fix