Fixing son issues