fonso fixing stuff