Fix wrong entrySet implementation