#50 - fix backward compatibility