partial fix of top