first workingf fix for #1041
better messages