Make compatible with 1.3.x

This would close #120