Fixed issue with double screens