This is BROKEN, same bug as the original