Fix #3 by adding specific support for bind-class.