fix LP:#1157955 and LP:#1157958