some fixing ..