Still broken, fixing returned elements