few more fixed