F1387

I added some fixes