some fixes but still doesn't work