additional fix #175 - should be ok now