slightly better backward compatibility; #1