Fixed broken backwards compatibility #192