Updated to work with lightblue/#39 change.