right, can you push over my fork the fixes ? thx