Fixed Error for 0.9+