Updated to run with 0.15.1