fix from juankruiz