community fix from kit400