Fix backwards compatibility (#234)