Added bugfixes for Ę3438 Ę3430 Ę3388