fix from sjinks & clean