Trying to make compatible with 1.0a