Fix old code causing exception, 0.4.1