Fixed new API glitch