Trying to make work with both 0.8.3 and 0.9