including fix for 1258