Fix for atom api changes