#399 Added backward compatibility

@Chrico correct?