some more fixes to work for user issue