bugfix: keep backward compatibility