some general fixing