Bugfix and backward compatibility